SHDP-257 SHDP-265 batch changes