Partial #290 quest engine checkin