Tagging version 7.x-0.40.1
Merge branch 'release/7.x-0.40.1'