Merge branch 'tq/t1510'