F21 with upstream Bundler