WIP map o bject
Merge remote-tracking branch 'yosida/master' into akatuka10_9
wip1016_2