am 45e4d877: Allow to disable forced keep of annotated

* commit '45e4d877614b194e24afbb90024130fd4e3156f5':
  Allow to disable forced keep of annotated