Merge branch 'hotfix/refactor'
Merge branch 'develop'
Merge branch 'develop'
Added regex validation.
Merge branch 'hotfix/regex' into develop