Allow null cost descriptions
Merge remote-tracking branch 'origin/master' into aquatics-blm