Merge branch 'release/7.x-0.42.4' into develop
tagging version 7.x-0.42.5
Merge branch 'release/7.x-0.42.5'