Merged stuff from v1.65