Updated with latest from v1.65