Merge branch '3718_radio_notify'