Merged in v1.64-areas-dashboard