Merge "Hunt around for alternative shutter IDs." into oc-dev