Forward port '7.0' until 0ffb968