Merge pull request #20328 from alalek:backport_20321