Intermediate commit after digesting https://toolkit.shotgunsoftware.com/entries/23797786