upgrade to 2.5.0 code from rosewright
upgrade to 2.5.0 code from rosewright