Merge "Fix Parameterized Bitstream runners"