Merge branch 'feature/domain-blocks' into 'develop'