Fix embed_in_root_key merging
Merge pull request #647 from gauthier-delacroix/Fix-embed_in_root_key-merging

Fix embed_in_root_key merging