Sweeping !33795 from 21.2 to master. Fix boundary issues in tight WP

Fix boundary issues in tight WP

See merge request !33795 (merged)

Merge request reports

Loading