Send #18079 to feedback. Manual -> overall.
Fix conflicts, merge branches.