Merge the arm controls from Kirill

Kirill's arm control code was tested and works.
It was merged from the toporov23 branch to development branch. I'll now try another manual merge to fix the conflicts.