Merge branch 'rs/resolve-ref-optional-result'