[v6r12] Just innocuous backportings from integration to v6r12