hotfix to avoid image build errors See merge request !463 (cherry picked from commit d4abf357) e2e7e889 hotfix to avoid image build errors