Merge "SF: Fix mBuffer management"