Merge commit 'd31c4a38e552ad67f5ab1f0cef279c89a1c75c6d'
Merge commit '078c91ba1a05c2c579a80b16c991a4453aaf7825'
Merge branch 'master' into resharding