Bring camera branch up to date with major update #4

Closed schielb closed 2 years ago