Merge branch 'sb/show-ref-parse-options'