Merge to 6.2.x er5

Merge fixes from master to 6.2.x for the ER5 release