added changes from v3.4.8
added all currently merged PRs, waiting on a few more