Upstream

Sorry for the mess with the pull requests. I watched the "network" and suddenly became more clear.

This PR has some standard new features, don't think there is anything to dismiss.