Yegor's update from bug #39991 - better identification of what underlying picture data a picture object relates to