Update to latest upstream version 3.4.5