Merged v1.65 into v1.64-areas-dashboard in prep to move to basing off v1.65