[#11815] Code style fixes