Merged latest fixes from v1.60 to multi-area