Forward port 7.0 until e103aff