Initial TS-8150 commit