replace type=number by a required digit pattern
Merge branch 'dev'