[Reviewer: Mike] IBCF ;orig handling

Hi Mike - this adds the IBCF ;orig handling as discussed. Please can you review. Thanks.