This picks up changes from a135199ab104a8068f6dd672f813760d17128212 and 1b35c9e27e8b6acff0bf1a4c1a030492e0e533d5.