Minimal Changes prior to 7.0.0 release