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