Previous implementation of weight name cleaning doesn't catch the cases where you have a comma in the weight name. This MR addresses this issue.
.cc/ @ewelina @lcorpe