Merge commit 'd93747081afc5b9874b5e8fd6a4a0e33607588b8'
Merge commit '9a3e198a02711b7049b9380c81c5921055ec563f'
Merge branch 'resharding'
Merge commit '68f68cc8195614c24d87220b144e30381e623f37'
Merge branch 'master' into resharding