Merge branch 'mapping-info-fix-datatype' into 'master'

Fix mapping info datatype

See merge request !39
12 jobs for master in 33 minutes and 16 seconds (queued for 1 second)