Checkout WP-3847 branch of gsb_public