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