Merged latest changes from v1.61