Merge "Resolve an old TODO." into lmp-dev