Merge "Fix exception when adding configs with incomplete security types" into sc-dev