Nightly Commit. Possibly fixed the Camera issue