We forgot to do this before the release :( Relavant commits are: 4e11ddfd, 0bb007f7, a3d19f5d, bf760801, 4793c310. Suitable for backporting. (cherry picked from commit 9653108f)
