Merge "various fixes:" into lmp-dev