Refactor block and fix gather redundancy seg fault

6 jobs for develop in 1 minute and 21 seconds (queued for 1 second)