Merge branch '2-2-wip-jdutil' into 2-2-stable