fix bug with optional view loading
implement reloading using cluster instead of up
Merge branch 'master' into evaluations
fix issues with cluster
Merge branch 'master' into evaluations