Image not being displayed in Edit View

With a UI Type 69 field, when you view a record in Detail View the img src attaribute is populated from data retrieved using the getImageDetails() method of the Record Model. It calls:

$url = \Vtiger_Functions::getFilePublicURL($imageId, $imageName);

Producing a url such as: http://test.libertus.co.uk/720/public.php?fid=624615&key=00001266.jpg

However, when you enter Edit View this method is not used so the url assigned to the img src attribute looks like this: http://test.libertus.co.uk/720/storage/2019/October/week2/624615_00001266.jpg

Which doesn't get loaded by the web browser so you just see the empty image. This is using a very recent pull of the master branch.