Rebase on current Kryo trunk