Merge "Introduce an ITradeInMode service." into main