Patch Set 5: Looks good to me, approved; Build Successful; IP review completed

Rebased to current master. Still fails sometimes, don't know why. But it's better than before. So let's take this as a base for further improvement.