Kunpeng

Merge remote-tracking branch 'upstream/dev' into kunpeng.
Updates map paths.