Extend OSOM for patching CRs
issue