Merge branch 'owenleonard/ht_sandbox' of git@github.com:apippin/tc into owenleonard...