Apply patch from CLJ-1315