LPS-37346 Sort
LPS-37346 Sort others
LPS-37346 Source formatting