A more sensible error message (OMS-240)
Merge branch 'master' into oms-240
Default prefix is 32, if absent (OMS-240)