(M-00297): Separate C5-2331.