Dev -> Kunpeng merge

Updates the kunpeng branch with dev branch, deleted items that broke map file.