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