Merge "Fixing regression in what is considered a restart attempt" into oc-dev