Ella Rohm-Ensing

> This PR contains a fix but also adds some possibly incompatible changes that needs to be discussed. Can you lay out the possible incompatible changes?

> We need this separation for everything to be consistent but maybe it require some preparation before delivery to cloud. What is the preparation needed - is it on our...

Thank you for the update @davydov-d!

@davydov-d would you please rebase? There are lots of unrelated changes in the diff. Otherwise I believe it looks good