Merge branch 'release-2.140.92' into dev