Merge "CleanSpec!" into lmp-dev