Merge "Proxy fixes from API review feedback" into lmp-dev