Backport #610 in 2.4(.4), update release notes