Merging upgrade to 2.0 from Jay Hogan