Merge "Add missing annotations"