Tested a bit. Ready to merge to mainline.