commit TP3 (2013-09-29)