Merge pull request #42421 from thaJeztah/20.10_backport_more_ignore