LPS-49873 Keep the same order of params