Merge branch 'fix-indirect-flow_block-infrastructure'