Patch Set 7: Looks good to me, approved; IP review completed

rebased to master, tested again (also with Linux).
Since all comments are answered and tests work well I will submit this this evening when I don't see new comments