#SXT merge