LPS-46349 General source formatting