Hotfix before stacklight is merged
3 files changed