Update to upstream version 3.39
PR: 224890 Submitted by: dgeo@centrale-marseille.fr Approved by: jadawin (via personal message)