Merge branch 'release/7.x-0.48.1' into develop
release 7.x-0.48.2
Merge branch 'release/7.x-0.48.2'