Merge pull request #5780 from jaimeMF/remove-nondash