Fixes #3720 - Add description field to operatingsystem
Fixes #3721 - Map OS family to a display variant