Merge testbranch_cam to testbranch

Camera_rename