Merge remote-tracking branch 'origin/release_1.22.0' into develop

Change-Id: I5c99d273a81a6ffb371dd106b399ba5a5196110f