Though this does not bring any functional change... The only important fix
was cherry-picked already.