Merge "Deprecate option for old api_export_size bug"