WIP: Resolve "Resq - command to get erroneous warranties" #1281

Draft
korina.cordero wants to merge 6 commits from 407-resq-command-to-get-erroneous-warranties into master

6 commits