Re: 15.2.4 backport PRs