Merge "Keep existing API behavior that regressed." into lmp-dev