Merge branch 'release-2.140.123' into dev