[Olena-patches] 1406: Update the form of routines so that images are returned.