Merge branch 'master' into it1_controller