Merge edmt fork