7.0.2 rc2 fixes

I made this PR in order to test the last PRs in order to submit them in the next 7.0.2 release.
@ockham , @jancborchardt , @tribut , could you take a look if it's not too late ?