Fix m_blocks_added
Merge remote-tracking branch 'upstream/master' into lock
oops
Merge remote-tracking branch 'upstream/master' into lock
wip