Merge "Remove the Advanced item when Security type is open" into sc-v2-dev