@Neoklosch, can you update your develop branch from mine, so we have only your work as a diff, and not some noisy work I did?