Merge branch 'release/7.x-2.21' into develop
expand log message text
release 7.x-2.22
Merge branch 'release/7.x-2.22'