Merge "Fixed WTF that happens on race condition." into oc-dev