Merge branch 'domob1812-extra-output' into orphan-blocks-stuck-chain2