Finished implementing the annotation shapes.
FInished with the implementation of annotation shapes.
Merged the last changes from upstream and solved conflicts.