Merge changes in master to camera branch