Merge "Fixed multiple MAP issues." into lmp-dev