Merge "Guard against incorrect context use." into oc-dev