Final commit TP6