[Finishes #44109843] Add git story-merge
Merge branch '44109843-story-merge'