Merge remote-tracking branch 'origin/bugfix/12566-dont-resize-image' into testing (Fix-committed: #12566).