Seems like a fairly straightforward backport for icehouse (assuming you don't need the ofagent bits).
Seems like a fairly straightforward backport for icehouse (assuming you don't need the ofagent bits).