Fix embed_in_root_key merging
Merge remote-tracking branch 'origin/Fix-embed_in_root_key-merging' into Custom