[MERGE] merged the localization branch