Merge commit '5baeefe618e9808b063899f9bbc946b3859ebe42'
Merge commit '5b2839fe32fa3833aa589014dac9f1b3e6fd6c6f'
Merge branch 'master' into resharding