Fixes #5499
Merge pull request #5502 from mwerezak/robot-actuator

Fixes #5499