Merge branch 'cc/starts-n-ends-with-endgame'