Draft: Resolve "idempotent Option::unpack"

Open Razvan Becheriu requested to merge 2718-idempotent-option-unpack into master

Closes #2718

Merge request reports