fix assets
Merge branch 'feature/add_polymorphic_to_slots' into staging