LPS-31996
LPS-31996 Source formatting