Merge "Fix manual connection of configs with multiple security types" into sc-dev