[MERGE] Forward-port latest 7.0 bugfixes, up to f8671cb