merge in Rdevel from Nick