Merged latest from v1.62 into trunk