bugfix
Merge branch 'QUEST' into brandnew