[PATCH 0/2] Bundler usage changes