first commit for 6.0 with changes