Fix the remove of all images in the catalog [Backport] #11148
raumatbel:2.1-develop% was force-pushed and no longer has any new commits.
Pushing new commits will allow the pull request to be re-opened.
Pushing new commits will allow the pull request to be re-opened.