6.2.x

Merging changes from upstream