Update operator controls
Merge