Merged most (all?) work from v1.64-areas-dashboard into v1.64-new-areas-dashboard