Merge pull request #8408 from remitamine/dash