Merge branch 'feature/remove-disable-blocks' into 'develop'