PLA-793 image fix for visitor
Merge remote-tracking branch 'origin/PLA-793' into PLA-793