Merge "Add consumer IR framework" into klp-dev