Merge branch 'features/typed_annotations_calcId' into develop