Merge branch 'master' into develop
case 3816 - Remove tag name in CSS selector to cover wider markups.
Merge branch 'hotfix'