(M-01505): Separate CB04138.