Add dependencies and use commits up to current master from conformal.