Patch Set 8: Looks good to me, but someone else must approve; Unclean IP, do not check in

Looks good as first iteration. Has been submitted to IP review. Hence blocked via IP review flag until CQ has been approved. 

Subsequent iterations should be done in additional changes depending on this one to not invalidate the started IP review process for this first part.