Merge "Updated Setup files for PM Mapper"