Fixing numeric check.
Merge branch 'next' into deploy