Merge pull request #3401 from Segrain/master

ERT cameras on master.
Piping and wiring fixes.