autoControl tracking update
Merge branch 'automaticControl'