Switch to feature/local-address branch (proxy)