Merge "Fix dashboard for matching environment name"