Merge pull request #186 from bastilian/fix/18518-PR2
Fixes #18518 - Add proper validation for container image
Merge pull request #186 from bastilian/fix/18518-PR2
Fixes #18518 - Add proper validation for container image