Bundling: Changes related to review + fix modules that required more imports. #1347