Merged in change from v1.64