Merge "SF - plumbing game mode for metrics (Part 1)" into sc-dev