[Reviewer: Mike] Sto940 em

Mike, can you review these changes for the gemini/memento builds?