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