CONN-1203

CONN-1164: Anchors

Rebase onto CONNECT of https://github.com/CONNECT-Solution/CONNECT/pull/847

Also:
- Addressed comments on PR #847
- Made a couple small bug fixes