Add and make TB24 default
Merge branch 'staging' into production