The hard limit should be a lot more liberal, 10x seems reasonable.
Merge branch 'raise-hard-limit' into 'master'

Raise hard limit