Recommit r52524 (ialex) after general revert r54735: '' => null when 'descriptionmsg...