Merge commit 'c2a836a5f41897267aa92e5fdeecdf94203d640c' * commit 'c2a836a5f41897267aa92e5fdeecdf94203d640c': Changed SyncOperation.toKey() to not rely on the implementation of
Merge commit 'c2a836a5f41897267aa92e5fdeecdf94203d640c' * commit 'c2a836a5f41897267aa92e5fdeecdf94203d640c': Changed SyncOperation.toKey() to not rely on the implementation of