Ready to test manually
ConnectorStatus renamed to Status
Adding logic for CROSSDATA-240
Merge with local branch
CROSSDATA-240 resolved
Finish CROSSDATA-240