Merged v1.60 changes into multi-area