Resolve "2538 options should not contain themselves"

Merged Thomas Markwalder requested to merge 2538-options-should-not-contain-themselves into master

Closes #2538

Merge request reports