Fix UNDERTOW-210 & sync / rebase with upstream