Merge "Fix a race condition in BaseBundle." into main