HH-47396 fix tornado-3 compatibility