Iranian pilgrims will participate in this year's annual hajjinfo-icon, Saudi Arabiainfo-icon said on Friday, despite ruptured ties between the regional rivals.

For the first time in nearly three decades Iraninfo-icon's pilgrims -- which would have numbered about 60,000 -- did not attend last year's hajj after Riyadh and Tehraninfo-icon failed to agree on security and logistics.

 Iran boycotted the Hajj for three years between 1988 and 1990 after clashes between Iranian pilgrims and Saudi police in 1987 left around 400 people dead.

"The ministry of hajj and the Iranian organisation have completed all the necessary measures to ensure Iranian pilgrims perform hajj 1438 according to the procedures followed by all Musliminfo-icon countries," the official Saudi Press Agency said, referring to this year in the Islamic calendar.

The hajj ministry said that the kingdom, home to Islam's holiest sites, welcomes "all pilgrims from all the different nationalities and backgrounds". Although the verbal sparring continued, Saudi mediainfo-icon reported in December that the Saudi minister in charge of pilgrimages, Mohammed Bentin, had invited Iran to discuss arrangements for this year's hajj.

An Iranian delegation visited Saudi Arabia in February for talks with Bentin.In early March, Iran said there had been progress.

"Most of the questions up for discussion have been resolved and a couple of issues are remaining," Iran's ISNA news agency quoted Ali Ghazi Askar, the Iranian supreme leader's representative for hajj affairs, as saying.

"If those questions are resolved, we hope pilgrims will soon be sent to Saudi Arabia."A major issue was compensation for the families of hundreds of people killed in a stampede during the 2015 hajj. Iran says 464 of its citizens died in the disaster.

More than 1.8 million faithful took part in last year's hajj. The pilgrimage is one of the five pillars of Islam and all Muslims who can must perform it at least once in their lives.Iranian pilgrims have for the past two years not attended the lesser pilgrimage to Mecca and Medina in western Saudi Arabia, known as umrah, which occurs outside hajj.

Tehran suspended its umrah participation over the sexual assault of two Iranian teenage boy pilgrims by Saudi police at Jeddah airport in early 2015.

Ghazi Askar said Iran had raised this issue as well, and if the culprits were punished, "the lesser hajj will also be restored".

Despite agreement on the hajj, Riyadh maintains its criticism of Iran, as highlighted in talks on Tuesday between Deputy Crown Prince Mohammed bin Salman and USinfo-icon President Donald Trumpinfo-icon.

The two leaders "noted the importance of confronting Iran's destabilising regional activities", the White House said.