(cherry picked from commit 6c32d271d2) This should have already been merged via 9cd82df0bb, but that merge went wrong.
6c32d271d2
9cd82df0bb