Remove property annotations early (before collection)
Merge branch 'master' into fix-annos
Merge branch 'master' into fix-annos
Only remove property annotations in reanalysis.
Cleanup
Merge branch 'fix-annos'