LPS-41567
LPS-41567 Source formatting