Merge "Fix issue #17614141: Add protection for accessing images" into lmp-dev