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

merged that to master by mistake, should have happened before merging to master, since we need some more patches we need this on stable-1.0