Upstream hotfixes