Merge "Flag trade in mode service correctly" into main