Merge pull request #19607 from alalek:backport_19606