Fix for some subblocks not properly getting blocked

We were seeing sporradic blocking of relatives when subblocks were in
use.
Merge branch 'pseudoblock-repair' into develop