2 Commits (fix-initial-blocks)