Merge branch 'feature-option-o'