Cherry picking the new SnowmobileMore branch to Snowmobile. I had accidentally committed these changes to Aux and subsequently converted them to a new branch.