Syncing from dev_treemap_tmp