Move to TP 4.40.0.CR2-SNAPSHOT