Backport to master of the "GCS Octox fix"

see https://github.com/TauLabs/TauLabs/pull/1089