Removed block contents and permissions from feature
Merge branch 'hotfix/release-10-fix-1'