Merged recent changes to v1.62