case 2982 - Added a fix into JS for mobile version.
Merge branch 'case-2982' into develop