Merge "add dashboard"