Merged from quest