Merge branch 'ma/ts-cleanups' into maint