This should be discussed during a possible OCS 2.0 process. I think this is out of scope of this fix.