Imported Upstream version 1.2.22
Merge tag 'upstream/1.2.22'

Upstream version 1.2.22
update changelog for 1.2.22
fix patches for 1.2.22