Consume Mike's upstream changes as of up to a6fbf0d5fec283bdbafde914286887a760dd34b2