Fixing Regex
Merge remote-tracking branch 'origin/hotfix' into dev