MDL-30085 Missing and invalid comments fixed