Merge feature branch into master (before release).

Merge feature branch into master (before release). #10235