Merge photo sending with upstream