Common - minor changes
Common routing split rx change