remove usages of unwrap().
@bug W-2310519@
Merging origin/ravi/master-pending-getRidOfSetValue into master