Merge branch 'release/7.x-0.22' into develop
Test updated for US 1277
Tagging version 7.x-0.23
Merge branch 'release/7.x-0.23'