Manual merge of bunchc changes: proxy addition