Merge branch 'release-2.140.117' into dev