Prep work for the Buildings by Abbr view
Merge branch 'refs/heads/test' into prod