MDL-33122 Coding style cleanup during integration