fixTPversionsInTrunk (apply in master from fixTPversionsInTrunk)