Fix merge issue with soop_xbt_nrt