Adding support for spaces in the key comment field. Bug 411