Pushed to upstream

cc/ @ealonso.  We forgot these descriptors