This commit also updates tests since UNDERTOW-1260 has been fixed in this release. Closes gh-12852
Attach a file by drag & drop or click to upload
