Updated QLS outliner
Merged conflicts