Merge branch 'release-2.140.118' into dev