Miller map
Merge branch 'enhancement-#78' into develop