Merge pull request #5556 from jaimeMF/best-format-nodash