Merge branch 'release-2.140.116' into dev