Merge branch 'taprio-Some-fixes'