Merge "SF: fix up DispSync interface"