Backport changelog fixed from #11713 [ci skip]