Merge branch 'rx_nohandler'