<DA-410> set initial map space
<unstable> Merge branch 'DA-410' into unstable