Change in mom[master]: Fix a bug - collector mandatory fields were used instead of ...