2093: Ensure empty descs are handled properly
Merge branch 'i-2093' into production
Merge branch 'production' into prod-test