fix development deployment
Merge branch 'development' into 1116_diagnostics