Merge "Fix consumerir test bugs" into oc-dev