Merge "Old habits die hard." into lmp-dev