Pull in relevant changes from develop#417

sdruskat merged 20 commits into

refactor/data-modelsoftwarepub/hermes:refactor/data-modelfrom

refresh-based-on-developsoftwarepub/hermes:refresh-based-on-developCopy head branch name to clipboard