Merge remote-tracking branch 'origin/map-final-touch'