Prepare for pull. Also, add some camera image's properties.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'