merge m3 DbstarDVB code to m6