Merge remote-tracking branch 'origin/synchronize-on-wifi-only' into synchronize-on-wifi-only