53595b1688
* commit '432ab6ac04f22a5e4c15aece04117b35bbf8869c': Fixing possible race condition.
* commit '432ab6ac04f22a5e4c15aece04117b35bbf8869c': Fixing possible race condition.