CC-179 fixing trailing comma bug
Merge commit 'f14826dfb135019ff991177f748173bcfd46a48d' into HEAD