OSC issues for Shiva

In Progress