Merge remote branch 'origin/option-ref'