Updates to devtree from caf