Merge "Fix race condition crash" into oc-mr1-dev