Feature #5592: Fix issue of photo sharing