sharding: merge upstream Former-commit-id: 5129a4d5bc4395cd7c115b7f8db23541a512df3f [formerly e4f2b25a4277464c51b4c45384114a305464d3c4] Former-commit-id: 2b4f0e356d3823889466d0f6ff22d5632f827f48
Former-commit-id: 6a2a7c34e451465eae5d78f76e310e36a412d848 [formerly 6294fcfb3a206061cc8f9309f945f9b0c5a332a2] Former-commit-id: e2d352442cc4b45620454ac6ece0f8d3d564ed11
Events with just 1 argument fail before this change Former-commit-id: 69cbb51c56054208417e464dc6e46a94ccb3bbeb [formerly fbb03244929beb0ce8f9c607ce33d107e8319b89] Former-commit-id: 984154c1ba79f1fe8bf0106a604b2765ea312079