Imported Upstream version 6.2.11
Merge tag 'upstream/6.2.11'

Upstream version 6.2.11
update changelog