case 3211 - Fix for collection items js error.
Merge branch 'case-3211' into develop