GCS/Uploader- workarounds for legacy BL