Rename MarkAttribute to FromClass
Merge remote-tracking branch 'origin/connection_refactor' into connection_refactor