SONAR-5007 Improve bulk change