Merge "Fix join scenario with provision discovery"