Merge branch 'RepeatedDupBlocksDisconnect'