Merge "Be more lenient when processing group headers" into oc-dr1-dev