Merge branch 'devel-dt-free-map' into devel