Build 99.7 compatibility#140

t0stiman wants to merge 12 commits intomasterInsprill/dv-mapify:masterfrom

build99.7Insprill/dv-mapify:build99.7Copy head branch name to clipboard