Issue #3491279: Changes to prevent adding of suggestions that have conflicting changes in other workspaces
Closes #3491279