Added context save with blocks.
Merge branch 'dev'