Merge "Eliminate misleading warning." into lmp-dev