Patch Set 7: Looks good to me, but someone else must approve; Build Successful; IP review completed

Rebased on current master and cherry-picked so it doesn't depends on Id8411470893220819c7a7c3992ca4cc6b66bab2f