Merge "I am such an idiot." into lmp-dev