Merge "keep tx3g{Buffer,Size,Filled} in sync" into rvc-dev