Merge "autojoin fixes:" into lmp-dev