Merge "SF: avoid calling pendingBuffers.insert twice" into sc-dev