FORGE-1421: Moved back to ShrinkWrap Descriptors #2