updated to latest in .12 branch