configuration and stabilization of robots and FIX NPE
Merge remote-tracking branch 'origin/master'