Merge "Fix name "Quantum" to "Neutron" in comment"