patch: resync gemini engine with caf