Merge "Change the default value of sync mode to NORMAL"