fix block notifications on reorg
Merge branch 'fix_reorg_block_notifications'