Merge "Add support for multiple fill contexts" into oc-dev