LPS-19914 Source formatting