reduced handling fixes CLJ-1557