Website diagnostics commands
Merge branch 'dev' into diagnostics