LPS-32073 LPS-32076 Fix source formatting in 287110066cb2da6d9b663bf874f9d461c1d377a7
LPS-32102 Change to new path