Hotfix branch building off master that should be compatible with stargate-6