TP-16: From master to TP-16 branch