Merged changes from v1.61