Cyborg update.
Merge pull request #3098 from Segrain/bleeding-edge-freeze

Tweaks for cyborgs.