Merged changes from v1.65