Merged in changes from v1.65