CON-1303: Changes in JS