Rolled forward to commit 90e25ab7d3ed8e5dd1c06e520cae208a8d26a099.