Imported Upstream version 6.2.12
Merge tag 'upstream/6.2.12'

Upstream version 6.2.12
Update to upstream release - 6.2.12