Fix OC-8214: [',' on the next line] formatting option + review CR-OC @Anton.Makeev
(cherry picked from commit b78367f)