Resolve #3520333 "Improve image styles logic"

Closes #3520333

Merge request reports

Loading