First commit of 3.10.17 to branc 3.10.17.