merged with bts_xt_gui branch