R_DEV upgrade

Title says it all
R_DEV emergency fix