automerge: 0a1f0d7 * commit '0a1f0d74f25e3f50a705f57ad037d24cad8ad8f8': Fix null handling in proxies.
0a1f0d7