Follow the gsb_public release-1.1 branch