Merge "Fix crash on "Connection preferences""