Fix block type
Merge branch 'master' into anna