dcf30a69d6
More consistent with M665 where C-value is allowed as well, then normalized
More consistent with M665 where C-value is allowed as well, then normalized