MN compare to Upstream before merge conflict#2

yoshimo wants to merge 11 commits into

Scotts_Midnightyoshimo/Grail:Scotts_Midnightfrom

TheWarWithinyoshimo/Grail:TheWarWithinCopy head branch name to clipboard