Merge "Shut up" into lmp-dev