refactor convertion method
fix map crash on changing drallo
Merge branch 'unstable' into DA-383
Merge branch 'DA-383' into unstable