bz915767 kitchensink-rf change