Merge "New behavior of setSynchronousMode" into pi-dev