Merge "Add titan" into lp5.1