LPS-34177 Source formatting
LPS-34177 Sort