no message
Merge remote-tracking branch 'origin/beta' into beta
quest fixes, added avoidance
Merge remote-tracking branch 'origin/beta' into beta