Merge branch 'master' into development
case 3211 - Fix for collection items js error.
Merge branch 'hotfix'