Merge "Fix reliability triggering" into oc-mr1-dev