Merge "Fix issue with Constructor proxies."