Need to rebase with upstream and resolve https://github.com/gpsimpact/NVRIS/commit/6da0bb6bf5b2bfb522b602b37302a386de93afda and then create PR for upstream with our changes.
Need to rebase with upstream and resolve
gpsimpact/NVRIS@6da0bb6
and then create PR for upstream with our changes.