initial commit
misc changes for 2.4 release