Merge pull request #3884 from pks-t/pks/patch-image-initialization

Patch image initialization