Revert "Revert "Latest Changes to shotgun""

This reverts commit e77dbe372148a449e3debce324bce9aee073afa2.