commit TP2 (20130918)