CON-95 | S:MWN Final refactoring in js