Merge branch 'release-2.140.94' into dev