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