[dev-context] Gyre enhancements