WIP: Resolve "Refactor warranty system" #1182

Draft
korina.cordero wants to merge 8 commits from 331-refactor-warranty-system into master

8 commits