Cross merge pull request #2663