Updated planning map
Merge branch 'master' into local