merge hv v6, rework trace methods