Merge warranty changes from staging #630

Closed mtedeschi closed 6 years ago