Looks good to me. I'm waiting to merge it pending answer to Petr's question.
Eli, I reassigned it to you since this is taking a long time. Assuming no further changes, as far as I'm concerned you can merge it once you have product approval.