Merge "Better handling of unvalidated networks." into lmp-dev