(M-47028): Fix strokes; separate C4-6561.