[origin-ui-180] Removing discard_global_option