PLA-399 fixing image serving