Merge "Ensure that we check against the pending state while suspended." into oc-dev