Upstream and kix patches