Merge pull request #1908 from cfi-gb/add_bypass_corrections

Add correction for bypass and variants.