Do AdHoc_RO*, especially?? AdHoc_RO_SP? need to be durable? 
If not, I suppose that could/should be a logically separate subsequent change. 
Did I see a reference (misleading?)  to such a change in the pro branch commit comment?