Merge remote-tracking branch 'origin/feature/15114-remove-purple-rectangles' into feature/15114-remove-purple-rectangles