LPS-42708 Keep alphabetical order