Render multiple rubrics, collapse rubrics
Merge remote-tracking branch 'origin/feature/vik/oe-ui' into feature/vik/oe-ui