nfc: AVAB Building array upgrade#2665

Thomas-Benson wants to merge 2 commits intomainGeoNet/delta:mainfrom

AVAB-recorder-swapGeoNet/delta:AVAB-recorder-swapCopy head branch name to clipboard