Merge "Add more connectivity module settings"