Enhanced previous commit
Merge branch 'annotation_animation' into develop