Interim js patch for [CB-2094] issue