HH-41231 tornado-3 support