Separated branch for easier consumption in bundler.