Merge "Avoid reusing a currently active NetID." into lmp-dev