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