[IMP-dev] Merge of EMBED into IMP