Merge commit '00b92b943ff397cb7f7c4827a0eea9df7aa22071' into kraken * commit '00b92b943ff397cb7f7c4827a0eea9df7aa22071': revert a change in the SyncManager that caused it to not cancel
Merge commit '00b92b943ff397cb7f7c4827a0eea9df7aa22071' into kraken * commit '00b92b943ff397cb7f7c4827a0eea9df7aa22071': revert a change in the SyncManager that caused it to not cancel