Fixed missing annotations
APOLLO-4007 Merged in master