Merged into rx3/tx3