Initial commits for 6.1 release