Merge Camera contributions from Sean