Update default copy during bootstrap
Merge branch 'master' into init-map