Re: proposed backport from 7.9 to 7.8