fix bug with default blocks
Merge branch 'master' into testing