Merge "Refactor SF. Move all GL operations in their own class."