PRD-4254 - Fixing dependency issues
PRD-4254 - Prevent shared connection editing. This creates unclean semantics