Merge branch 'hotfix/data-regex-fix'
Updated regex pattern based on php regex quirks.
Merge branch 'hotfix/fix-data-pattern' into develop