updated for 6.04.0 release