Unfortunately we can't just cherry-pick #4238 because there have been further changes to the changelog since the 4.4 branch was pulled out.
