LPS-46966 - General source formatting