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