commit pre-TP3