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