Dashboard fix
Merge branch 'greg'
Merge branch 'master' into ns-interactions-init