Merge "fixed horizon for sl_os_contrail"