Merge roots latest into efeqdev