disable default blocks
use block instead of context for persistent blocks
Merge remote-tracking branch 'bnchdrff/master'