Merge branch 'rs/opt-help-text'