applied 3 patches from jhi