Merge "Fixed a bug where autobundling could lead to bugs" into nyc-dev