CamSim merge with OGAMOTUMBNDSC

Merge OGAMOTUMBNDSC changes into CamSim