fix
Merge branch 'master' into auto-load-map