Merge "More features." into lmp-dev