PLA-466 fixing image serving