Commit 6 for TP-16
Commit 7 for TP-16