Merge "Resolve race condition in old API message handler"