Merge "Add tempest_horizon in Hunter gates"