fixed bug in regex -> invalid xml
Merge remote-tracking branch 'origin/development' into development