Merge "Update dashboard"