Merge branch 'feature/1087-wildcard-option-for-blocks' into 'develop'