[MERGE] Forward-port of 7.0 bugfixes up to e2201369a314feaec70a485f0459c1dcdcecd82b