Merge branch 'cc/downcase-opt-help'