WEB-4419 (TWN suggestions)