1899: Make sure we always have a description, even if blank
Merge branch 'production' into i-1899-from-production