HH-43534 changes for tornado3 upgrade