missing changes of Titan merge