Merge pull request #14075 from mexon/mat/empty-picture-scale