Podman fix.
Merge pull request #3514 from Zuhayr/master

Podman fix.