Fix broken images API for version <1.7 Upstream-commit: 09702f4c31e2b3899192318659ff59512cb28d8d Component: engine