Merge "Import several fixes from main repo:" into lmp-dev