Merge branch 'release/5.40.0'