Merge "Restored switchTo method" into nyc-dev