HBX-1226 Proxy declaration uses ImportContext
Merge remote-tracking branch 'karlvr/proxy-equals'