Fixed validation keyword pattern and converted type for numbers/boolean annotation value
Merge remote-tracking branch 'origin/master'