CamSim merge from OGAMOTUMBNDSC

Merged the CamSim and OGAMOTUMBNDSC forks