latest master changes, fix OC_Image use in thumbnail