Merged in updates from v1.65