[WIP][SPIKE] Accordion refactorings #5551
+270
−186
Draft
Loading