SONAR-5007 Rework bulk change