TP 746 and TP 729

#746 and #729