Scotland flanker John Hardie has signed a two-year contract with Scottish Rugby, which will see him join Edinburgh after the Rugby World Cup.
The 27-year-old joined Scotland's Rugby World Cup 2015 squad in July as a free agent after his previous playing contract in New Zealand with the Highlanders ended.
He played three Rugby World Cup 2015 matches for Scotland, winning the man of the match award against Samoa, scoring two tries and only missing two Pool B fixtures against USA and South Africa through injury.
Scottish Rugby identified Hardie's eligibility for its national team over two years ago through his Scottish ancestry and after positive performances for his country in the Rugby World Cup and earlier summer series offered him an opportunity to continue playing in the northern hemisphere and Scotland with Edinburgh.
John Hardie said: "It's a privilege to have the opportunity to stay in Scotland and play for a Scottish club. I see it as an exciting new challenge in my rugby career and I am really looking forward to joining up with the squad and competing for a place in the team.
"Edinburgh have made a strong start to the season and I hope I can help the boys and contribute to continuing that success.”
Edinburgh head coach Alan Solomons said: "We are very happy to welcome John to Edinburgh Rugby. He is a quality player who will add real value to our squad."
Scott Johnson, Scottish Rugby's director of rugby said: "John has proved himself to be an excellent professional and his performances during the Rugby World Cup consolidated our belief that we would like him continuing his rugby in Scotland.
"This new contract means he can develop his career in Scotland and make himself available for national selection.
"It is also vital we continue to recruit well to develop our professional teams, so his addition to the Edinburgh Rugby squad will strengthen both his connection to rugby in the country and the team."