text and control changes
Merge branch 'master' into dev