Merge "Allow to disable forced keep of annotated"