Merge without activation changes

Merging this branch will do everything that the original merge branch did - my activation changes. I've created pull requests that make Troy's other PR (multiple locations) compatible with this branch without losing commit information.