Merge "SF: Fix buffer use after move"