Merge "Fixes OVF converter and upload"