Merge "fix SF buffer cropping"