Eli, look ok?
If yes, can it please be pulled into 5.3 branch.

Andrew