Merge "SF Buffer Stuffing" into sc-dev