WIP: Resolve "Resq - warranty cleanup command" #1277

Draft
korina.cordero wants to merge 3 commits from 402-resq-warranty-cleanup-command into master

3 commits