Merge "Add wait for plugin upload"