tpt++/jacksonmj: assorted commits d9089d13c4d7 79edfe9589c4 7270461985cd 2e52e209a663