LPS-47692 - General source formatting