Imported Upstream version 5.6.22
Merge tag 'upstream/5.6.22'

Upstream version 5.6.22
New upstream version