Merged in v1.62 to db branch