Merge branch 'progarray_mapinmap_dump'