Fixes for emagging robots
Merge pull request #4316 from RKF45/robots

Fixes for emagging robots