Cross merge pull request #2794