r10409: updates for cl-photo