Merge "enable synchronous mode (functional)"