Merge branch 'tsqbx' into ts-fix-install-instr