Merge branch 'v4.3-dev' into 'v4.x-master'

Minor mapping bug fixed in processing

See merge request !53
4 jobs for v4.x-master in 4 minutes and 44 seconds