Merge "AOD: Fix broken triggers after failed prox check" into oc-dev