Merged 'mapfix' into 'stable'