Merging TroubleTicket app with SE changes