Try to fix [#50596803]
Merge branch 'feature-50596803-Image_comps'