Merge "Fix a deadlock due to wtf in BaseBundle" into nyc-dev