Merge "Bug 2294: Handle Shard backwards compatibility"