Set of commits addressing TP issues

Commits should be reviewed BEFORE merging them