Co-authored-by: Nathan Mercer <nmercer@intermap.com> Co-authored-by: wangli28 <wangli28@beyondsoft.com>