Avoid multiple loading of same embedded objects

Closes #1795