Merge branch 't/map_populate'