Merged in v1.62 and few minor fixes