Merged v1.64 into areas-dashboard branch.