Pyeongchang 2018 has apologised to Iran's team at the Winter Olympics after it was informed that it would not receive the special limited edition Samsung Galaxy Note8 handsets being given to all other athletes at the Games.
It was revealed last month that more than 4,000 devices would be delivered to competitors.
But reports suggested it had been decided that athletes from both Iran and North Korea would be excluded because of international sanctions against the two countries.
These led to the South Korean ambassador to Tehran, Kim Seung-ho, being summoned to the Iranian Ministry of Foreign Affairs.
Iran also called for an apology from Samsung, claiming that its trade relations would otherwise be "greatly affected".
The International Olympic Committee (IOC) has since clarified that athletes from both countries would receive the Samsung phones, but that the North Koreans would be asked not to take them home.
"A letter was today sent from Pyeongchang 2018 President Mr Lee Hee-beom...to apologise for the misunderstanding regarding the distribution of mobile phones to the Iranian athletes," a statement from Pyeongchang 2018 said.
"The IOC has confirmed that the Iranian athletes are entitled to receive and keep the phones.
"Samsung Electronics delivered over 4,000 Pyeongchang 2018 Olympic Games Limited Edition - a special edition of Galaxy Note8 - to the IOC and Pyeongchang Organising Committee.
"The company was not involved in the decision-making process regarding the distribution of the phones."
IOC and #PyeongChang2018 Organizing Committee letters to Iran 🇮🇷 NOC to express regrets to what happened for disturbing @Samsung smartphones. #Olympic Values @olympic @pyeongchang2018 @insidethegames pic.twitter.com/0HCGoDThII— Amir Sedighi (@AmirSedighi1) February 9, 2018
Samsung said the IOC was responsible for distributing gifts at the Olympic Games and that it would not comment any further on the matter.
After receiving the apology, Iranian Sports Minister Masoud Soltanifar was quoted as saying by the Islamic Republic News Agency that "the offence against the Islamic Republic’s athletes and...nation has been rectified".
The row reportedly begun on Wednesday (February 7), when the Iranian team queued up at a Samsung stall to receive the phones.
Reza Salehi Amiri, the newly-elected President of the National Olympic Committee of the Islamic Republic of Iran, said the team was sent away without their phones because "United Nations sanctions" prohibited the supply of luxury items to Iran.
The Pyeongchang 2018 Olympic Games limited edition handset includes the bold new features of the Galaxy Note8, such as the innovative bezel-less 6.3-inch infinity display that the company claims fits comfortably in one hand, enhanced S pen for efficient productivity, and Samsung’s best-in-class dual camera.
Exclusively for the Olympics, it showcases a shiny white back glass to celebrate the winter theme, and gold Olympic rings - inspired by the Olympic Torch – "an expression of the Olympic Movement with the union of five continents, and unity worldwide".
The phone also features celebratory pre-loaded Pyeongchang 2018 themed wallpapers, allowing recipients to stay connected through Samsung’s most advanced mobile technology.
As an added element, useful apps are pre-installed to help athletes enjoy their experience at Pyeongchang 2018, which is due to conclude on February 25.
Samsung also plans to provide a limited edition Galaxy Note8 to each competitor at the Winter Paralympic Games, scheduled to take place between March 9 and 18.
The cases will feature the logo of the Paralympic Games.