Merge warranty issues into master #688

Closed mtedeschi closed 6 years ago