ensure the controls are get clicks
Merge branch 'master' into ubuntu