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

accepting this fix as a temporary solution as the other changes we proposed for completely fixing this issues need more time to finish them. We'll follow up on these after 1.0 is out.