Branch 'VADER' - proxy/proxy