Bump version to indicate rebase against upstream version 3.46