SONAR-5209 Better transitions between duplications