Merge "SF: Modify transaction/buffer sync logic"