Fix logic for yielding DescriptionAttribute.
Merge branch 'master' into spike/TrimAAAAspect