3/12 - mapper bug fix
Merge remote-tracking branch 'origin/kicho'