Send #18109 to feedback. Habitat -> Manual -> future prosp.
Fix conflicts, merge branches.