bugfix
Merge branch 'QUEST'