Merge "Remove unnecessary trade in mode protection level" into main