Merge "bagostuff: optimize SqlBagOStuff and fix failing segmentation tests"