Code updated wrt changes on sc_xscope_support repo