Bug fixing: Annotations
Merge remote-tracking branch 'origin/release-candidate' into develop