Merge from master to 6.2.x for ER5