annotation unification added

Merged Богатенкова Анастасия requested to merge i9560_annotations_unification into develop Nov 27, 2020