Decision from planning meeting.

AttributeAnnotator changes only needed for 1.0.1 and not for hotfix, splitting out the database change