Merge "Remove sync flush"