Changes for a 7.x-2.0.0 release