Merge pull request #19520 from dyarkovoy/master