Merge "Replace Proxy hidden constants and methods usages"