Resolve "Warranty changes for sku" #1477

Open
korina.cordero wants to merge 2 commits from 562-warranty-changes-for-sku into master-fix

2 commits