Sync with quantum-gateway upstream