Fixing issue with remoteIDs that contains commas
Merge branch 'develop'