Merge jnode commit 5899