Merge branch 'feature/blocks' into 'develop'