Merge "Protect against possible race conditions" into oc-dev