Merge "Enhancement in switch configuration"