Map type id is changed at a different moment
Merge branch 'dev'