Merge "Don't display project commands multiple times on save of options"