Merge branch 'release/7.x-0.52.3' into develop
Tagging version 7.x-0.52.4
Merge branch 'release/7.x-0.52.4'