Rolling sonata bundles to 2.1.x