Good amount of misc changes
Using 1.2.0 rc2 - Needs to be manually added to scripts as a temp solution