m4: merge TangentOrg/ddm4