Sweeping !4580 from 21.0 to master. Adding new bunch pattern to check 8be4 fill pattern See merge request !4598 Former-commit-id: f3ae2ae5