-map type switcher
-re-added header draft
Merge remote-tracking branch 'origin/master'