Update changes for 6.0 release