infinality & upstream patch update