Merge "[compass]:[merge after 18665]rename region name to be unified"