Merge "BUG-1026: workaround race condition"