Merge pull request #3511 from Ansuel/no-hard