APPOLLO-2070 Fixed merge artifact
APOLLO-2070 Removed @Type annotations