Merge branch 'feature/add-block' into 'develop'

Feature/add block

See merge request !26
4 jobs for develop in 2 minutes and 42 seconds