Edinburgh are "building a really strong side", says fly-half Jaco van der Walt after signing a contract extension.
The South Africa-born Scotland playmaker, 26, has been with the Murrayfield club since November 2017, scoring 373 points in 66 appearances.
Capped once since qualifying through residency, he has been named in Gregor Townsend's Six Nations squad.
"Playing here has definitely tested my game," said Van der Walt. "I've really had to develop my skills."
He is the fourth Scotland player to commit his future to the club in recent weeks, following deals for Hamish Watson, Jamie Ritchie and Blair Kinghorn.
He said: "I have fallen in love with this city. My wife and I have made it our home and we're delighted to have committed to spending our future together in Edinburgh.
"It's been absolutely brilliant, and my family and the club have played a huge role in supporting my wife and I and encouraging us to chase our dreams.
"I still have a lot more to learn about the game and I'm excited to grow and develop those skills with Edinburgh."
Meanwhile scrum-half Jamie Dobie has extended his deal with Glasgow Warriors.
The 19-year-old, who has made 15 appearances over the past two seasons, has also been invited to train with the Scotland squad prior to the Six Nations.