MDL-25314 coding style improvement