Merging 6.2 changes