LPS-32031 Merging
LPS-32031 Source formatting