Merge "Do not synchronize if not necessary"