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

* commit 'c3f5d7183a21cb081bab1a6bca3fc115523e4e78':
  Fix null handling in proxies.
tree: c25b4bd20c775317fd9ebda791588b584ba0ce78
  1. core/
  2. services/
  3. tests/