Send #18078 to feedback.
Fix conflicts and merge branches.