merged with latest arq gemini commits