Merge "Fix connect & save of invalid networks" into jb-dev