LPS-36312 - Fix source formatting
LPS-36444 SF