* Remove unwrap on line option, preventing DAP crash, ref #4683 * Update to fall back to existing values for option fields