Merge "Refactor merged annotations creation"