More strict numbers check
Merge branch 'strict-numbers' into validation-only

* strict-numbers:
  More strict numbers check