Merge "Fixed Pattern SUW a11y bug" into main