Merge branch 'crio-compiling-switch' into network-robot-new