mecha fixes
Merge pull request #3858 from DJSnapshot/dev-freeze

Mecha fixes