Merge "Fix null handling in proxies." into lmp-dev