update clean old block logic
Merge remote-tracking branch 'origin/develop' into develop