forward-port rest of changes to 3.0.1 release notes