[MERGE] Forward-port of 7.0 bugfixes up to 7d3453d119a80f484918842682ac5f4299d91e7b