return to official 800 interface
Merge branch 'master' into no-no-reload