first tentative to manage proxy hell

Change-Id: I9bef0998cdf330fb8e8afb0bbf5b04b352d7795e