Paparazzi code from old release branch.