Merge "Only register conditions receiver when needed." into oc-dev