Proxy config for local branch
Replace class overrides with configuration file
Remove class overrides
Merge dev branch to master