Merge pull request #4596 from mwichmann/AddOption-option-obj