recommit changes for WEB-7686 on its own branch
Merge branch 'dev-WEB-7316'
Merge branch 'master' into dev-WEB-7316