Added a v3.7 user interface heads off
Merge branch 'master' into v3.7