note
Merge branch 'feature/extend-validator' into develop
renaming
forgot between rule
clean up regex