forward-port 3.4 release notes