[MERGE] Sync with 7.0, to have last fixes that were tested inside this branch.