Cross merge pull request #2800 to RC073