Changed the Id to a Guid. Instead of Particular.ServiceMatrix.Guid. Also replaced other instances of the code where this Id was being used.
Merge branch 'hotfix-2.0.2'