Merge branch 'hotfix/fixXss'
Task author
Merge branch 'hotfix/taskAuthor' into develop