case 2257 - Now the JS code is working with another variable for button logic.
Merge branch 'case-2257' into develop