Merge pull request #7300 from illume/fix-main-story