Changed orphanedEVSRule to be used for multiple entities.
Removed a redundant rule.
Merge branch 'working' into dev