Sweeping !35199 from 21.0 to master. Protect against invalid data when PNG not requested
Protect against invalid data when PNG not requested
See merge request !35199 (merged)
Protect against invalid data when PNG not requested
See merge request !35199 (merged)