Merge "SF: Remove more BQL dead code"