Merged in latest from v1.64