LPS-40360 formatting