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