SOS-1664 Don't group adding assets together, except DL
SOS-1630 include both constants
SOS-1630 styling
SOS-1630 SF